*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 35ebc439bdd26269ff18e768f85c9762c160148c..cbd5803637dc1a52c0f8d97923a2bfe2cdfa334e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-16  Juanma Barranquero  <lektu@terra.es>
+
+       * xdisp.c (try_scrolling): Make sure `scroll-conservatively' is
+       not too large before computing how much to scroll.
+
 2004-04-14  Luc Teirlinck  <teirllm@auburn.edu>
 
        * fileio.c (Fverify_visited_file_modtime, Fvisited_file_modtime):